From 492e6fa1cd47b34a026b9a296bcd3999814f6fe6 Mon Sep 17 00:00:00 2001 From: Kevin Ryde Date: Sat, 7 Jul 2012 18:10:47 +0800 Subject: [PATCH] * woman.el (woman2-process-escapes): Handle nofill regions. --- lisp/ChangeLog | 3 ++- lisp/woman.el | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26bff01b808..fd205571a3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,9 @@ -2012-07-07 Kevin Ryde +2012-07-07 Kevin Ryde * woman.el (woman-strings): Fix double-quote handling (Bug#1151). (woman-decode-region): Replace escaped-escapes without destroying bold or underline (Bug#11552). + (woman2-process-escapes): Handle nofill regions (Bug#11591). 2012-07-07 Chong Yidong diff --git a/lisp/woman.el b/lisp/woman.el index 4767b062335..32aee3baff8 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -3932,7 +3932,9 @@ Optional argument NUMERIC, if non-nil, means the argument is numeric." (while (re-search-forward "\\\\[&|^]" to t) (woman-delete-match 0) ;; If on a line by itself, consume newline as well (Bug#3651). - (and (eq (char-before (match-beginning 0)) ?\n) + ;; But not in a .nf region, preserve all newlines in that case. + (and (not woman-nofill) + (eq (char-before (match-beginning 0)) ?\n) (eq (char-after (match-beginning 0)) ?\n) (delete-char 1))) -- 2.30.2